Merge branch 'master' of git://git.denx.de/u-boot-net
authorTom Rini <[email protected]>
Fri, 26 Feb 2016 19:56:23 +0000 (14:56 -0500)
committerTom Rini <[email protected]>
Fri, 26 Feb 2016 19:56:23 +0000 (14:56 -0500)

Trivial merge